Use >= not > in deciding whether to subtract out x/ythickness. (#308145,

2005-07-26  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use
        >= not > in deciding whether to subtract out x/ythickness.
        (#308145, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 9bebc09b51ee597d75085276799409a7ecaf5f36..08ff8fb49417447da5755b9656b4d673cc5b2ccd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-26  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use
+       >= not > in deciding whether to subtract out x/ythickness.
+       (#308145, Morten Welinder)
+
 2005-07-26  Elijah Newren  <newren@gmail.com>
 
        Revert part of patch from #166379; don't have gtk_window_present()

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9bebc09b51ee597d75085276799409a7ecaf5f36..08ff8fb49417447da5755b9656b4d673cc5b2ccd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-07-26  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use
+       >= not > in deciding whether to subtract out x/ythickness.
+       (#308145, Morten Welinder)
+
 2005-07-26  Elijah Newren  <newren@gmail.com>
 
        Revert part of patch from #166379; don't have gtk_window_present()

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9bebc09b51ee597d75085276799409a7ecaf5f36..08ff8fb49417447da5755b9656b4d673cc5b2ccd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-07-26  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use
+       >= not > in deciding whether to subtract out x/ythickness.
+       (#308145, Morten Welinder)
+
 2005-07-26  Elijah Newren  <newren@gmail.com>
 
        Revert part of patch from #166379; don't have gtk_window_present()

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index ffe7f810fc8c76fff0d76eb12aa4c5978c93cba6..eb18477885bd02546a51f24106de1ccdcdac1085 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3611,13 +3611,13 @@ gtk_notebook_page_allocate (GtkNotebook     *notebook,
        case GTK_POS_TOP:
          page->allocation.y += ythickness;
        case GTK_POS_BOTTOM:
-         if (page->allocation.height > ythickness)
+         if (page->allocation.height >= ythickness)
            page->allocation.height -= ythickness;
          break;
        case GTK_POS_LEFT:
          page->allocation.x += xthickness;
        case GTK_POS_RIGHT:
-         if (page->allocation.width > xthickness)
+         if (page->allocation.width >= xthickness)
            page->allocation.width -= xthickness;
          break;
        }